Merge "Remove dependency of libhardware_legacy" into oc-dev