Merge "Improve "adb sideload" error reporting." am: 66b25eb810 am: f2fe436d32
am: 2b0d807531

Change-Id: I9540db5d8095aa81b8bbc9dca646b61a186a462c