am 780d7d9f: Merge "Fix clang-format file for correct indent settings."

* commit '780d7d9f736a958bb40f27c3baf12873fb40129d':
  Fix clang-format file for correct indent settings.