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

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

Change-Id: Ic95727b1508f0b7b46b89bfb0ea041ba0b2b704f