Merge "init: Remove custom clang-format" am: e6b05dc683
am: f2ee4c8e4b

Change-Id: Ie6fe9f9ef7caf66d1ef43dd3e15acb4e14818c40