Merge "logd: use .clang-format-4 like the rest of system/core" am: bf17bd653a am: befe386ff0
am: 1d94035ab9

Change-Id: I4e70a15bab652a1a787c04b4a9a18357d279139f