am 821b37d8: am 0df45b08: am 260942fa: Merge "Build with java7 by default."

* commit '821b37d8174f2497153dfb8fcde7b8f84618e111':
  Build with java7 by default.