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

Change-Id: Iaa98e6881afa1d528e9583c47a3687c55e76f7db