Git extra commit

The rest of the APK size optimization commit.