Merge "Code changes for offload support in hardware libhardware"