Merge "bionic/x86: fix one potential deadlock in __set_tls()"