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

Change-Id: Ie6bb5c2eec6420527f3669bfcd91e17f9b63e8dc