Merge "Fix elf_writer_test for 64b target"