am a64c4a92: Merge "Update ElfWriterMclinker for klp"

* commit 'a64c4a92dff8cf6a0aa0e23e4b52d31d205edac5':
  Update ElfWriterMclinker for klp