Merge "libhidltransport: not in VNDK"