VPP-1144: PAPI Import leads to duplicate type definition.
VPP-1144: PAPI Import leads to duplicate type definition.

Change-Id: I54c147004fd93681a6a9cf30fa5277c1dabce67c
Signed-off-by: Ole Troan <aeed71d78dc09e4764ceac69b111eee9b50cfdd0@cisco.com>

vpp-dev/vpp,FDio/vpp,chrisy/vpp,FDio/vpp,FDio/vpp,vpp-dev/vpp,chrisy/vpp,chrisy/vpp,FDio/vpp,chrisy/vpp,chrisy/vpp,FDio/vpp,vpp-dev/vpp,chrisy/vpp,vpp-dev/vpp,vpp-dev/vpp,FDio/vpp,vpp-dev/vpp,vpp-dev/vpp,FDio/vpp,FDio/vpp,chrisy/vpp,chrisy/vpp