am d5165f81: am 3ec211a2: Merge "Fix declaration for softkeymaster_module"

* commit 'd5165f814b3bcb7a9568f0bb8eb016383258dbaf':
  Fix declaration for softkeymaster_module
tree: b68c39d2787808f6f0e5325fd238ee26d043db3a
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/