am 39c2996f: am be52c68d: Merge "Simplify template parameters of Elf classes."

* commit '39c2996fb2bba34c1303ac20e0588467aac5182b':
  Simplify template parameters of Elf classes.