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

Change-Id: Ic02f78f1c768476388659784c0ca7005832bf0df