Merge "Enable the clang-format pre-submit hook" am: 3b9e23513e am: 68a27cc5ab
am: 03ac2b1697

Change-Id: I4b26f5ca596b0ed07d28367a58b086fb26459fd8