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

Change-Id: I7e51bdf5798e969c9abe6ccfdbb22ec466fb31bc