Merge "Fixes incorrect update of DexMerger.main"