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

Change-Id: Id7f48fe3c4b1855e8e9a450c70db00f057502ad4