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

Change-Id: Ie146b1f184f3f255c4da8c0d368920f01d12f9c1