Merge change 4264 into donut

* changes:
  Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally reintroduced in an errant and clumsy git merge operation.