Revert "locking, semaphores: Annotate inner lock as raw"

This reverts commit 6446f546c839439106e51b2edb23144b45065705.