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 am: 68ac92fe
Change-Id: I61a78700de08fd731e74d4e07b163d525f7d37bd