Merge "adb: Fix return value in error case"
am: 2925a580e9

Change-Id: I6fa794d11212e77650f6ffcfd7ee2e80092a9e0a