Bug: 181797530 Test: rbcrun build/make/tests/run.rbc Change-Id: I196c69259b830b6466430f6c933afb49fa787948