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

Change-Id: I48ac59dfc1914e750e908409d82de7ce73dea3f6