Merge "Revert "Temporary apply LIBC version to __pthread_gettid""