Merge "Fix declaration for softkeymaster_module"
tree: 8ff0069348ff1b986c2977ea0e56037d8715ddcf
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/