Fix libc/private/bionic_tls.h merge