Merge "Add WTF when a system server wrapper can't be found" into rvc-dev am: bea34c409f am: 90ea8e34db am: 498d3e314c am: f3e86c8a00

Change-Id: I9a93be434e26d4e5a2e674c9e8ee27b949238039