Merge "Fix problems with DexClassLoaderTest."