Merge "Filename refactoring, remove DEXOPT_OTA flag."