Merge "zipalign supports -p also when checking alignment."