Merge "Use C++ thread_local rather than libcutils." am: 3f78a9f13a am: 566afbe75b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1516547

Change-Id: Ifce51ce92a04c667c9c426fa9204f594a031f067