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

Change-Id: Ib7264769736f45e2dd9729e4b0e1f443953c314b