Merge "Added standalone benchmark for keymaster."
am: 3f7f55b378

Change-Id: Ia66365ee626662395a4ef36274d5acbc7e29a4ad