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

Change-Id: Ia5af01cff22105dce5bbe23ce7bfcb877de05643