Merge "Remove libhwbinder/libhidltransport deps" am: 20a9b3b4a3
am: 690a3c31b0

Change-Id: I56d9e61e3bd4bb9490d45df559e3a5b3165cb699