make ant use java 7

The ant build tool has a package and runtime dependency on java 6.  The runtime dependency
can be changed by setting JAVA_HOME.  This change sets the ant runtime dependency to
java 7.

Change-Id: I5d2ac7fb3dc7bdb390edcc728b86a84c946f8752
Merge "make ant use java 7"