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

Change-Id: Iff36351cf0ebdd95f0c6800ad903caaceea4b79b