Merge "Clean up ARM assembler files to use ENTRY/END."