Merge "Prevent dexlayout from moving code items if preceded by class data."
am: 106173ac95

Change-Id: I64d3ac1c88ef53fc31a2cca1ef0e684a382d57eb