Revert "Move type definition to common repository" am: c0207cd824 am: 29ad1464db am: c1d7d47e21

Change-Id: If8de2a296324d956039d5a7d0c970dcb47a37c4f