This change removes lock recursions and adds thread annotations. Bug: webrtc:11567 Change-Id: Ibefb49bb5b865cb0bb33e4580d34d9837fb41bff Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175121 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Commit-Queue: Markus Handell <handellm@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31260}