am 4e2f1903: Merge "Clean up Javac a little bit."

* commit '4e2f190315759b4270ab414b9ff1e24a19521521':
  Clean up Javac a little bit.