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

Change-Id: I4b7e18e308c471b65917ed0a85c6083af484842a