am 7a35b085: Merge "Use the exported elfutils headers."

* commit '7a35b08548fbdadd43b79f98297d0d7cf2fea1c5':
  Use the exported elfutils headers.