Merge "Prevent dexlayout from moving code items if preceded by class data." am: 106173ac am: 2726ddd3 am: 0d047578 Change-Id: I302de9fa59e27658be65f523a766513e371454ac