Merge "Allow USE_GOMA=true without explicit USE_NINJA=true"