am 03798dd2: am 1fea0f25: Merge "Clean up ARM assembler files to use ENTRY/END."

# Via Android Git Automerger (1) and others
* commit '03798dd23cd3d1dc1ee4c4b0472c75369aa1e10f':
  Clean up ARM assembler files to use ENTRY/END.