Merge "Improve "adb install"\'s error message slightly." am: d361582dc0
am: 79abeb68f2

* commit '79abeb68f26c3ff9b99929fe15b25fd202225ffc':
  Improve "adb install"'s error message slightly.