Merge "Fix container overflow for compact dex writer"