Merge "Revert "Try to be consistent when setting fields of OatWriter::OatDexFile.""
am: dd257c6ac2

Change-Id: I4e4f30496b67d1c281edeff8fdac00076684d80e