Removed unused typedef

Fixes gcc -Wunused-local-typedefs warning, which is
part of -Wall in gcc 4.8.

Change-Id: I644d57eaa43e6321497ac0948aad6a033dca4b94
Merge topic 'Wunused-local-typedefs-fix' into master

5a92d059 Removed unused typedef