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