Patch from origin repo:

49dea51 Luke Inman-Semerau on 26.10.15 at 20:56 (committed on 26.10.15 at 22:20)
actually uninstall... adb install -r doesn't seem to actually work all the time.

Fixes #994