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