Merge "64bit fixes for elf file."