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: I9e68765d2b95937fc4f1de021c8e25d0c74b8092