Move more functionality out of ensure_android_bundle.sh