Cleanup and add support for launching the service from adb.

Fixes #4