roken fixup

Change-Id: I2db45a83691764a9bfb9caa9050aeb47bd6317fb
hcrypto fixup

Change-Id: I89fcee892c1ba7d1b16365727dce48dc5cb4909f