ToUpstream: Add zipalign feature