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

Change-Id: Icbad7ee9744e69244469937bb659f12965ca4599