Merge "Remove USE_NINJA=false"