am af22b86d: am 555377d5: Merge "Add a local elf.h"

* commit 'af22b86db1bd410a882d16b6393e1ea2dcdb36ba':
  Add a local elf.h