rebase on latest code, refine android build
Merge pull request #423 from licaiguo/refine-android-build-pr

rebase on latest code, refine android build