Merge "Revert "Add WTF when a system server wrapper can't be found"" into...
Merge "Revert "Add WTF when a system server wrapper can't be found"" into rvc-dev am: 6d81a5f5 am: 59807937 am: dc5bd32c
Change-Id: Ia25f6e8c3fa6471c77b68b93e41f78e3260536a7