Merge "Fix clang-format file for correct indent settings."