More changes for Android APK building.