am f7386706: Merge "Reformat software keymaster with clang-format."

* commit 'f7386706a1d92eefdc02f359aa46cfe33f2d158a':
  Reformat software keymaster with clang-format.