am d6beffe7: Merge "Make part of the elf_writer_test specific to the portable build."

* commit 'd6beffe76384f569c244352f79a47c684637e2b6':
  Make part of the elf_writer_test specific to the portable build.