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

Change-Id: Id48f4ac86eaaaf22661b251d0dd100e16fefe425