Merge "Remove libhwbinder/libhidltransport deps" am: 32f968b767
am: 350e380ced

Change-Id: I918bc5573f6f0efa676573209ce1874b02462576