Merge "run-tests-on-android.sh: more build server improvements."