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

Change-Id: Ibe2a988fbc0504e9fe7ea21823f682399a2eb373