am 9efc18fb: am da3eec42: am 708242d5: Merge "Increase the maximum javac heap size."

* commit '9efc18fb99d6d4229a1d4ad993b50b6ffb15f054':
  Increase the maximum javac heap size.