Merge "Use the boot class loader as parent of system server loader." am: 7baf5a8d73 am: c2a38e56f3
am: 955963c109

Change-Id: I732692d12432b0bd0d5e3a313e49388d2cfc34ac