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

Change-Id: Id5517a6765aaee85fa9c26a5cec1b7ed45a59847