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

Change-Id: I3d144e8051733b3c9bffe41df1152a270c5ba2c7