Make keymaster compatible with latest BoringSSL. am: 51aa826788
am: 7f0549dc06

Change-Id: If0117bb679e9434d670c9e41aca34019991f8354