Merge "Refactor compact dex writing"