am b6f4e037: am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge." * commit 'b6f4e0372154191bdf1ee32727aead1fe1200cbc': Revert "Fix alignment when recompacting a DexMerger result. do not merge."