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

Change-Id: I52d0f14d8a842504b01a681eaa1dfa8e9253b675