Revert "Move type definition to common repository" am: c0207cd824 am: 29ad1464db am: 34aeaa46d5 am: 3da5dd0114

Change-Id: I869ee47b67ae9f188f5e3f2e105a8e2b1e6d3f65