Bug: 193540681 Test: rbcrun build/make/tests/run.rbc Change-Id: I129136e83d2d00ef5b64d3aab07b98719198dcfe