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

Change-Id: If2f2b20b1269f9750d3f56c392fa7ae7f29c86ff