Test: make Bug:309953452 Change-Id: I2b0dc17f1debc71ed78d37007213210a7a1aed77
Bug: 258114806 Test: build pass with all the things still in the ROM Change-Id: Iafa355c047d39cfb21ef043ed0e7b4108630b781