Merge "Remove libhwbinder/libhidltransport deps" am: 0b2cf30522
am: b19d15b55c

Change-Id: I299ed6788163b57cfd9cdcb65e1a61842d335289