am 44332cc2: Merge "Add proper cfi directives." into lmp-dev

* commit '44332cc21494726c9ba90ac8f23af8acc2dc4536':
  Add proper cfi directives.