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

Change-Id: Icea2319fccabe91b9946717a58f3cb7327c9ff50