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

Change-Id: I543a292b66690bd4764e262ee422e3ee47a02882