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

Change-Id: I9571ed4171d592d78e76278ffbeee9f978d4de43