Merge "Fix zipalign README file and usage strings."