Fix roles merging to apply only to non-rep-injective types.

Authored by ezyang on Mar 1 2017, 1:55 AM.