Remove Java 6 build support

Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
Merge "Remove Java 6 build support"
Merge remote-tracking branch 'upstream/master'