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

* commit '95c3470ba8ca4442ecfd918ebeb6bdb89bfe5a6a':
  Simplify template parameters of Elf classes.