refreshed android-build-hacks patch