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

Change-Id: I8151bd6b0a3d7eb18760268d9bf7363bd2263a1e