Merge "libvts_common must export libhardware_headers"