Merge "tools: Allow testing with javac on buildbot"
am: 731906083e

Change-Id: I2d65de4024052fe1312090f5f815b2833223145b