Merge "Remove libhwbinder/libhidltransport deps" am: fbc5ce63ae
am: 68210ffa65

Change-Id: I2b7ddd144bdfd54e012d3c7d2fd323f051515bd1