Merge "libhidltransport is using libvndksupport"