Merge "Make USE_NINJA=true the default"