Merge "Increase max heap size for javac to 2GB." am: ae67473255  -s ours am: c2b3797630  -s ours
am: 342ac430ef  -s ours

Change-Id: I5b9054c041575fbe2b345533c6b30c1a2372e5b9