Merge "Handle code item overruns in cdex code item write"
am: 83784ca898

Change-Id: I8729c319e24afcd97c30b2fcda24a3589f079a48