Merge "Revert "Preload non-bootclasspath Java lib ClassLoaders."" am: d08c3b655b
am: 7561d4667c

Change-Id: Id50466763aedf746d796af8575ea922fdd9cad8e