Merge "Use C++ thread_local rather than libcutils."