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

Bug: 21338668
Change-Id: Iea8804c462f3bd1e5cc24c8f6d12e41b09a15d53
1 file changed