Merge "Export headers as libhardware_headers"