Merge "Update BoringSSL structs in keystore-engine."
am: 975e1aae69

Change-Id: I4cd2a30d7281476eb30083dc04187784f8dad445