Merge "Remove DEXOPT_OTA flag."