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

Change-Id: Ic3cf3edaa176361ee94d573f485b3976f1978236