Merge "adb: treat non-successful inc-server runs as failures"