COMP: Remove unused typedefs.

Change-Id: If31de5a7f08bc057b0aaa3612ff9d336ab6dab41
Merge topic 'RemainingUnusedTypedefs'

94b21fd8 COMP: Remove unused typedefs.