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

* commit 'be52c68dca2f146a571ffa65624acf2e6c7adeb2':
  Simplify template parameters of Elf classes.