Merge "Revert "Try to be consistent when setting fields of OatWriter::OatDexFile."" am: dd257c6a am: 1c682fd2 am: cffa0ea7 Change-Id: I6659a0192c05422f3d1c82e4c9fca7d508842f7c