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

Change-Id: Ia7420cf2511c840b3f98979f79701e3f50b70924