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

Change-Id: Id68c31237b9c2836402448aa18cddbb107ed1dae