Some fixes for android-build.py.
Merge pull request #5787 from dumganhar/develop

Some fixes for android-build.py.