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

Change-Id: I907be6a3747c715acbd357fa8d6cd8c07370dbc1