am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support"

* commit 'f7ce9508dec85c67d3a2ebe84db073a01355eba5':
  Remove Java 6 build support