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

Change-Id: I240f2c2909b4a7513bd1fbc4aa2cbe12f36a75d2