Merge "Refactor the host adb argument parsing loop to remove a goto"