am 1a4676a1: Merge "Increase the maximum javac heap size again."

* commit '1a4676a17c5483c04f347a4e58890640a71c8368':
  Increase the maximum javac heap size again.