This change removes lock recursions and adds thread annotations. Bug: webrtc:11567 Change-Id: Ibc429571926693f4b3de78f97a5dc5501d93a4a3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176240 Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Commit-Queue: Markus Handell <handellm@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31369}