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

Change-Id: Ia507a7dff9ee93cfa8f2507f1a4bc5f2a3bac2e2