Merge "Simplify the construction of class loader contexts for system server...
Merge "Simplify the construction of class loader contexts for system server jars." into rvc-dev am: 26cb9994 am: 660df7a7
Change-Id: I79bf0daf7b8cfd37bdec6c62559aa9e4ed5c7632