Merge "Remove libhwbinder/libhidltransport deps" am: 6b62c58a9a am: 8c22c3862f
am: 6684ee8c36

Change-Id: I3cde9aa7e62793459bdced930ff4b72face8493a