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

Change-Id: I3fa6d9d485edb066f8c79e27775c58e4485bbfa2