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

Change-Id: I45077ffd37fad3a701f49f33aff58e39a4cb4b12