Merge "Revert "Link against libhidltransport.""