Merge "Fix build: lint error in elf_builder.h" am: 44612873bb
am: 94fcbf7efd

* commit '94fcbf7efd00122ecd2b1ce76b69182b5e209a9c':
  Fix build: lint error in elf_builder.h