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: ebe4eedf am: 3670acf9
Change-Id: I92a4df0b312442087cccfd8f0f568230f8129e02