fix android build
Merge branch 'master' into android-build