CMake fixes to integrate Android build process a little better