Clean up system service registration.

Bug: 143788029
Test: boot

Change-Id: I6e19e2b0f08b4977b3df1cf8b6972bf3fda6d4b9
4 files changed