Merge "Revert "Fixes incorrect update of DexMerger.main""