More changes for Android development