Merge "Better diagnostics from "adb sideload"."