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

* commit '0df45b0898710a2e7ddd723fae450ad701a4614d':
  Build with java7 by default.