Merge "Add a conditional removal of \r\n from adb output."