am a9dd3670: Merge "Restore bionic\'s <linux/elf-em.h>."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a9dd36702f4a9d65d084387050b688b8965b13b3':
  Restore bionic's <linux/elf-em.h>.