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

Change-Id: I84a2d469bb496b32ff42127b0eb305177f504682