Fixing the android build scripts