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

Change-Id: I5404d588843237ad396d29f5e500d77f05ecb91d