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|.