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

Change-Id: I52e0e1e32cb67ef03c9434f88f939765b7e42c0d