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 am: 179af808
Change-Id: I4792446b1add376e0ae19933c3502710fff5b1e3