Merge "Set system server's class loader for wrap.system_server" am: 8d2d6bfa12
am: 959628a32e

Change-Id: I88bfbb33aa1247a9b0d1d468b35621ed89abcc51