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

Change-Id: I3c029406ad185d7aff3a2113541746920cfb3650