am 9ef2bee2: am 09ba20ce: am fd251b33: am 1a4676a1: Merge "Increase the maximum javac heap size again."
am 9ef2bee2: am 09ba20ce: am fd251b33: am 1a4676a1: Merge "Increase the maximum javac heap size again."

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

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build