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

Change-Id: I8347ed8be9dc3c408af26b410bdb57fde8128de9