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

Change-Id: Ib2976993a8d1f1d19b46fd6686ab3a4a30fbdaa7