Merge "Refactor PackageDexOptimizer" am: b3edbd7432 am: 8259b91984 am: db19cad1db
am: c4adc2ce0a  -s ours

Change-Id: I4b208f034a6b3cc627825dc6f78a2f27fec57ca7