Merge "Remove the redundant DISABLE_DEXPREOPT"