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

Change-Id: I9b16e7c1dfe6650b2a63ec0e45e8818b3af228be