Merge "Remapping ELF section headers to match loaded code"