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

Change-Id: Ifa5a28904d2113131af25a7816ae2303262f9688