Merge "Move offload config hidl usage from native to java" am: 7cacdf7446 am: b5930afb19

Change-Id: I2b09804822126c47dbce3133ca6d852b49762fec