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

Change-Id: I12f037d475120da06aac8203ccc009fff6df74fc