Merge "Always do cdex conversion for OatWriter dexlayout"
am: ddc694267a

Change-Id: Idb804dd7fe70dbc335105fa1451fdf0d92ec246a