Refactor build for 1.1.2. Change to Java 6 for Android support