Merge "logwrapper: update benchmark and remove old functions" am: aa3160abd8 am: ae72d8b231
am: 2c612f47c0

Change-Id: Iab8d3bb4f1c5e948085c11f6b9b034141a5d80f6