Merge "Fix broken dexopt logic."