Merge "DexClassLoaderTest.setUp should clean optimized directory"