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