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 am: fae9fca2
Change-Id: Ibe80fbab227436a147763cdbcbfcccb620edd334