Merge "Try to be consistent when setting fields of OatWriter::OatDexFile."
am: 02f41015a0

Change-Id: I668b33ec8d95e73eab93ae6fcd82463d697624de