Merge "libhardware_headers export headers from libcutils"
am: 4ba2ac5844

Change-Id: I367e5101f46405ac4e105f6c2c7f6a3e1d55c4df