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

* commit 'fe7c8b693ddd8b4250cdb0dd0e5815966ddd0c20':
  Use the exported elfutils headers.