Merge "testrunner: Forward --build-with-javac-dx to run-test"