am ac653462: Merge "Fix alignment when recompacting a DexMerger result."

* commit 'ac653462268d0ec88c9c3979bd8c66a23549a7d2':
  Fix alignment when recompacting a DexMerger result.