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: 2aa7f372
Change-Id: I99a9b48d586ecf29981bd1a72af8a787cf5bc785