Merge "test: Fix broken build scripts causing art-test-javac to fail"
am: e882b6dc06

Change-Id: I43862efa58d4ff18a75f2581a889363e146c46b4