Merge "Handle configuration splits when creating the class loader context" am: 88946d4cf2
am: ee41710ef5  -s ours

Change-Id: I3a80cea56b5a310f8c0e9c6eff5586e98fe5df42