Clean up defines for type_traits

Change-Id: I10f228211fe5346f81246c9bdc70f50a0f90675f