Some fixes for android-build.py.