Update CMake and Android build