Merge "Fix adbd/adb server confusion in an error message."