Merge "Build with kati+ninja when USE_NINJA=true"