Fix build: Remove duplicate types

Change-Id: Ia3ebda7832828278818fbc9d8622238f98f367f9
36 files changed