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

Change-Id: I747b0ad3cf8994f13c816d04b5f7be6ebf5b2877