Merge "Fix vendor/google/build/ninja_config.mk"