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

Bug: 21338668
(cherry picked from commit 8981aee6a9b92058943f22b26e0996859b07d7a3)

Change-Id: I590d2e76e06b6ba277d7554a119d5351afab1b3f
1 file changed