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

Change-Id: Ia7e315279eb403bbc316b8eb44f6770b78fc1070