Reverted to Java 6
Updated gradle and android plugin