Merge "Handle configuration splits when creating the class loader context" into oc-mr1-dev am: ed54b41e3c
am: b2e1a3cbc2

Change-Id: I9c36d6cd44a6f65a3bbd6ea89f1f328e7fbfcfc6