Merge "clang-format local.h."
am: 0a8d5f3eb8

Change-Id: I24f53d545306bb8574ea466ae8aa4711b07747da