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

Change-Id: I263d26e88ff2c0eafec49955f7697f77069d0b96