am 833ec8ff: Merge "Add proper cfi directives."

* commit '833ec8ff84a25078f5755489d7a36db3015c069a':
  Add proper cfi directives.