update java alternatives to java 7

ant dependency requires java 6 so alternatives was set to java 6 on an ant package
install.  This change updates alternatives to point to java 7 after all packages
have been installed.

Change-Id: I7b8c975879dda085102a1d4740777d3d8c5f54ea
Merge "update java alternatives to java 7"