Merge "Dexlayout fix for duplicate class data and preserving last code item."