Merge commit 'c4d33d9d' into eclair * commit 'c4d33d9d': Fix ClassLoaderTest to work on DEXPREOPT builds.