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

Change-Id: I3e4b7b87d8758402a9427bc4f89ac5ab969a35d3