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

Change-Id: Ibb48cdd0384f4a8eac33306d513c36fe2a40326d