Fix security vulnerability in CryptoHal
am: b1f8c80d3a

Change-Id: I00d72bd20647471c62f6dd10dfba84193b0021ae