Merge "Improve "adb install"'s error message slightly."