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