am 8d01e624: Merge "softkeymaster: do not use GNU old-style field designators"

* commit '8d01e624d52d1c34de5926b5bc47d265532a9527':
  softkeymaster: do not use GNU old-style field designators
tree: ee949e5694e998334e4aa439d87d706ce5f907bf
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/