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

Change-Id: I55ad5fb84c7e35779305d732570e126f1a087df7