Merge "Add libhardware_headers to various modules" into oc-dr1-dev