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

Change-Id: Id67c494c59bc9e61f81406ac36d9c664adbf97b2