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

Change-Id: Ia10824c6bf0970eed9dd9c860bf21033b186fb6e