Merge "Reformat software keymaster with clang-format."