Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94" into stage-aosp-master
am: 6340d93571

Change-Id: Ic206b34a0535c3a8c92e45c3107d4f16985a5cb8