Merge "Rename assembly files with .S extensions."