Merge "Update ElfWriterMclinker for klp"