Update CMake toolchain for NDK r9
Add hack enabling Android builds with ninja on Windows
Remove comma character from string replace command
Merge branch 'r9'