Revert "Base cleanups" #12932

Job	Run time
raspi-2 / initialize	50s
raspi-2-skia / initialize	42s
raspi-2-skia / docker-build-image	1m 24s
raspi-2-skia / docker-unittest-image	0s
raspi-2 / docker-build-image	1m 23s
raspi-2 / docker-unittest-image	0s
raspi-2-skia / raspi-2-skia_devel	9m 32s
raspi-2-skia / raspi-2-skia_debug	13m 0s
raspi-2-skia / raspi-2-skia_qa	7m 56s
raspi-2-skia / raspi-2-skia_gold	7m 52s
raspi-2 / raspi_devel	9m 2s
raspi-2 / raspi_debug	12m 46s
raspi-2 / raspi_qa	7m 54s
raspi-2 / raspi_gold	7m 31s
raspi-2 / sbversion-15_devel	9m 14s
raspi-2 / sbversion-15_debug	14m 4s
raspi-2 / sbversion-15_qa	7m 46s
raspi-2 / sbversion-15_gold	7m 37s
raspi-2 / sbversion-16_devel	8m 59s
raspi-2 / sbversion-16_debug	13m 15s
raspi-2 / sbversion-16_qa	7m 58s
raspi-2 / sbversion-16_gold	7m 38s
raspi-2-skia / ${{ matrix.name }}_${{ matrix.shard }}_test	0s
raspi-2-skia / ${{ matrix.name }}_on_device_${{ matrix.shard }}	0s
raspi-2 / ${{ matrix.name }}_${{ matrix.shard }}_test	0s
raspi-2 / ${{ matrix.name }}_on_device_${{ matrix.shard }}	0s
	2h 36m 23s

Provide feedback