Merge "Fix container overflow for compact dex writer"
am: 42a6c3ba42

Change-Id: I185a683a71ab665b9ffe12c523f373df06d523e6