Merge "Do not keep the DexFile field in Main between runs"