Merge "Filename refactoring, remove DEXOPT_OTA flag."
am: 68603971f6

Change-Id: Ieb4e045c7b2d4b57647ba6e3afbc18ec28540cfb