Fix CI collision

These typedefs were removed recently, and a patch not using them got
merged which broke the build.  Fix it.

Tested: Code compiles.

Change-Id: Id76268415494d063715b67d8f0a0f88267a760a1
Signed-off-by: Ed Tanous <etanous@nvidia.com>