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: 53fba78c
Change-Id: Ia34300532e1ea7d65fd18ee779d68d294b29bb23