ClangFormat some changes from r305226 Post commit review feedback from Justin Bogner llvm-svn: 305919 GitOrigin-RevId: 8f9621ae0407e31dab865d9aa7235501125032f3