Merge "Preload non-bootclasspath Java lib ClassLoaders." am: 213812ba28
am: 625d63ed64

Change-Id: Ie3c5931c981095e574e9dcadf8ed88686749116a