Merge "Restore bionic's <linux/elf-em.h>."