Refreshed android-build-hacks patch