Merge "Use the existing .clang-format-2 for liblog"