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

Change-Id: Ia08f29201e703bc7f08f8a0de04712dafbe8cc81