Merge "Remove Java 6 build support"