Merge "clang-format ManifestFixer_test.cpp"
am: 171c9cdc6a

Change-Id: Ia252884dd1ddb2d1aad7b9b881e1107aa8160122