Merge "libhidltransport: not in VNDK" am: 6b21a983ae
am: db39942408

Change-Id: I7a793a6793289055585cb761e36e2eed524868e8