Merge "adb: Fix return value in error case"