Fix alignment when merging zips.
am: 1ce31f5522

Change-Id: I215ffd844b859e04e13ad3a5f8ef93329103618a