Merge pull request #9072 from andyque/fixCompileError

fix compile error
fixes how to check for CPU in android-build
Merge pull request #9076 from ricardoquesada/android_build_fix

fixes how to check for CPU in android-build