This change removes lock recursions and adds thread annotations. Bug: webrtc:11567 Change-Id: I28b18256e627f43dc0d01d28452b2bcbf59cebac Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175124 Reviewed-by: Stefan Holmer <stefan@webrtc.org> Commit-Queue: Markus Handell <handellm@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31271}