Revert "Fix alignment when recompacting a DexMerger result."

This reverts commit 49bfa354fc1ba2f03996c23c0abd4bbc0fd16e0a.