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

Change-Id: Iaaa9430484e8d30f5e70df193a4a56ed08bfc12a