Revert "Fix zipalign build error"

This reverts commit c910025f8716ece63cb75fa16be1f01901fbe45e.

Change-Id: I4dce4060f7a2ae5dfcd78dc7a47678ef14f91a95