Merge "Prevent dexlayout from moving code items if preceded by class data."