Merge "Fix OOME handling in VMClassLoader.getBootClassPathEntries()." am: cca411ec1d
am: a1d2d40dcf

Change-Id: Ic588ff421ae35d2b52968c8de8c23f8d62a5bc70