am 0a557b6b: am 7176a617: Merge "Don\'t use typedefs that hide *s."

* commit '0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce':
  Don't use typedefs that hide *s.