Increase the maximum javac heap size.

Java 7 needs more memory when you run some annotation tools.

Change-Id: Ia8b423244b9ce164500b24867fe2b3d10a5089ff
Increase the maximum javac heap size again.

Change-Id: Ic3422650ea22977f3dcfd74505cb287ff6543c2d