Merge "Fix error handling/reporting for "adb forward" and "adb reverse"."