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

Change-Id: I97d77c6537de1e328ba07a01cf95ade0d37933c2