Merge "test: Fix broken build scripts causing art-test-javac to fail" am: e882b6dc06 am: 64de9ab9a8 am: 0635700b8f
am: b12aabdb3c

Change-Id: Ie433e7f9198e02a06d043cfb4cbf827f6bbc6917