Merge "system/security/softkeymaster: don\'t pass a structure into |d2i_PrivateKey|." am: ec43173804
am: 5e9794f284

* commit '5e9794f284a226bcc053c66d58e2699cc1781c02':
  system/security/softkeymaster: don't pass a structure into |d2i_PrivateKey|.
tree: ef9045cbf936e960757093754db3260e865091a8
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE