Merge "Don't implement our own remove_cvref_t."
am: a93e09f834

Change-Id: I97e9f98b6ac10261220983bf25653987f515b2eb