Merge "Revert "Revert "Try to be consistent when setting fields of OatWriter::OatDexFile.""" am: b656fcbc am: 3385612d Change-Id: I81b40aa4a396df925928d6fd80ad319845c332c8