Merge "Create the class loader context within a Runtime scope."
am: 267789c018

Change-Id: I270827ba7b28a1c3cf22df417e11ee2c017252d5