Merge "Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94" into stage-aosp-master am: 6340d93571" into oc-dev-plus-aosp am: 41d52b1bb2  -s ours" into oc-dr1-dev-plus-aosp
am: ba48fd4828  -s ours

Change-Id: If3d0c2f97fbc86fa1489891c9d208d1462d41bad