[automerger skipped] Merge "Simplify the construction of class loader contexts...
[automerger skipped] Merge "Simplify the construction of class loader contexts for system server jars." am: 54c481ed am: a48d8d9b -s ours
am skip reason: Change-Id I33c4087f8bfacd0ecb89877aa150b75360d06710 with SHA-1 a4a83b0e is in history
Change-Id: I926b07787e255fa2abbb310755577b3d5ce3e5c7