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

* commit 'da3eec42e11d9ebe1e08fc7e64c7edaf59c28272':
  Increase the maximum javac heap size.