Merge "Refactor compact dex writing"
am: b3dfd1b23e

Change-Id: I60639eef41ace37b74bafcae0d5ed2915199ddcb