Bug: 170637441 Test: rbcrun build/make/tests/run.rbc Change-Id: Ie8f0c3dea66a287f2b0a3b588c446bfbb2c9a978