Merge "Explicitly include libhardware_header for vendors" into main