Merge "Make libcutils' thread local stuff more clearly deprecated." am: 77692aeea2 am: f512b499b8

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1515640

Change-Id: I87a4bc9d4b2076dc63c1a359ca15cc759d2ab5b4