Code cleanup & refactoring #1979

Job	Run time
Build apps (Foss, Debug, app)	7m 5s
Unit tests (Debug, test)	6m 49s
Lint vitals (Foss, Beta, app)	9m 9s
Unit tests (Debug, testFoss)	7m 32s
Build apps (Gplay, Debug, app)	6m 47s
Unit tests (Debug, testGplay)	9m 36s
Lint vitals (Foss, Release, app)	8m 54s
Lint vitals (Gplay, Beta, app)	7m 12s
Unit tests (Beta, test)	4m 37s
Lint vitals (Gplay, Release, app)	9m 17s
Unit tests (Beta, testFoss)	9m 31s
Unit tests (Beta, testGplay)	9m 28s
Unit tests (Release, test)	6m 50s
Unit tests (Release, testFoss)	7m 1s
Unit tests (Release, testGplay)	6m 56s
	1h 56m 44s

Provide feedback