Additional CMake changes to support Android