Crypto performance benchmark

This reverts commit 39087e3740095e1851b0fcf1988c1c0881a208b6. And adds
the respective fix.

Change-Id: I1f70211c77f892c6252cf5e05e5e52d6c63e2293
3 files changed