Merge "update .clang-format for version clang-7.0.1 update."