Merge "Clean up and simplify the logic in dexopt" am: 57eb11ed2d
am: 617b5a2bf9

Change-Id: I296990f67265262156b96d9b1353ce5d24e744ec