Fix thread_local/METADATA am: e1f0b36c9d am: 93bb2ff6ea

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thread_local/+/1413812

Change-Id: I4488ba621f6c54b75fe52787f234fcaba12bb1d2