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

# Via Android Git Automerger (1) and others
* commit '704d9c5b45515cc2421bfe3b37c93117da0a1334':
  Restore bionic's <linux/elf-em.h>.