Merge pull request #9076 from ricardoquesada/android_build_fix

fixes how to check for CPU in android-build
fixes for releasing
Merge pull request #9078 from ricardoquesada/releasing_fixes

fixes for releasing