Merge "clang-format: Double-indent continuation lines"