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

Change-Id: I5c115ee77930866958d12097db87ce902039f451