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

Change-Id: I99a5e704cb554d712808d5f2f246f280b37694c2