Merge "Try to be consistent when setting fields of OatWriter::OatDexFile." am: 02f41015 am: d8f44b37 am: e045427b Change-Id: Ief84731fba8290dad68b2286825839d38a1438ca