Merge "Fix dexlayout calculation of code item size."