Merge "Always do cdex conversion for OatWriter dexlayout"