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

Change-Id: I046320bca3c7faa63fb296ceb36f3c0e5559e765