Merge "adb: remove atransport ref counting." am: d692530a71 am: 2ad160be37

Change-Id: I4ab8e4fab8ab4f1dcfbfca6fb0446e29c6433f7b