Merge "Add .cfi_startproc/.cfi_endproc to ENTRY/END."