Merge "Use the existing .clang-format-2 for liblog"
am: 29c44f5710

Change-Id: I15538f6d35883242d7ece108c4f1c5e9e234e0b1