Merge "Revert "Preload non-bootclasspath Java lib ClassLoaders.""