Merge "adb: rationalize types." am: 8caf4e7443 am: e335bea277 am: 010818f313
am: f883e2f65c

Change-Id: Id6884e23a41c025e36582dc9323866cb2e46ac8a