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

Change-Id: I1d62a8e67b3b606cdbe9c6abe6caa81c17932c18