Merge "Fix dexlayout calculation of code item size."
am: acd764a6f1

Change-Id: I4a582f52589e9d0778d9b53feec7fb176f5dce66