Merge "android-rebuild.sh: Fix build server builds." into emu-master-dev