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

Change-Id: I096e1ec929e7946c913198fa1a28402470206697