Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9" into oc-dev-plus-aosp am: c8505e49c5  -s ours" into oc-dr1-dev-plus-aosp
am: 8cb1927666  -s ours

Change-Id: I5fb2cadcf585687a3c3d3d0f6ba5b3fc035803db