Merge "clang-format ManifestFixer_test.cpp"