Merge "Remove libhwbinder/libhidltransport deps" am: 72a1154774
am: b5955975ba

Change-Id: Id553ba13f12220e29c4734fb0a23f90fcbfc440f