Workaround sloppy scripting in android/envsetup.sh