Merge "Refactor PackageDexOptimizer"