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

Change-Id: I3a7b779206c7977662325b340b230d7e08bbf7c4