Merge "Add proper support for embedded elf files."