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

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

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