Updates to use Java 7

Reviewed in https://codereview.appspot.com/11456043/