Revert^2 "Correctly quote -Xbootclasspath argument in run-test-jar"
am: b801210385

Change-Id: I6df04561bac877eefe0794e8c81f09aa6a914615