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

* commit '09ba20ce647472ca6f5692bcf6eb5477fc3a818d':
  Increase the maximum javac heap size again.

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