Make keymaster compatible with latest BoringSSL.
am: 51aa826788

Change-Id: If3906d26457688ff6622a65cdd1df409a20646df