Switch to Java 1.6 compatibility for Android support

#6