Merge "adb: rationalize types."