Merge "[CTS] [Tagged Pointers] Fix `user` builds."