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

* commit '44612873bb02be8a59e16aa50f61cce9e9cc9547':
  Fix build: lint error in elf_builder.h