Bug: 193566316 Test: rbcrun build/make/tests/run.rbc Change-Id: Idf462d7f58e8d4a6e8b3a1506306f9eb67130dc8