Merge "Make libcutils' thread local stuff more clearly deprecated."