Merge "clatd's .clang-format shouldn't be kept in sync with system/core"