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

Change-Id: Idb9ac5526f341064982be84fb44f523fbef4521d