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: 1778f481 am: ce962d04
Change-Id: I20ca0e93de93479ef4add0afd5798cf04a18a998