Merge "Refactor PackageDexOptimizer" am: b3edbd7432 am: 8259b91984
am: db19cad1db

Change-Id: I3825f93d837f9dcc0de4ef45b059a458d9970690