Merge "zipalign: Remove dependency on androidfw."