Merge "logd: use .clang-format-4 like the rest of system/core"