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

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