Revert "Move type definition to common repository" am: c0207cd824 am: 7957c2282b am: 9408a78b05 am: f5b7a38c33

Change-Id: I107360d52daa10162bdd3be61a8cc3461b1db125