am db2e8be1: am ee00af67: am fccca44a: Merge "Code cleanup: Remove unused typedefs and declarations."

* commit 'db2e8be1363c898c81f60d7293ed9671d55fbd04':
  Code cleanup: Remove unused typedefs and declarations.