libgcrypt: keep new lock behavior but only do so around collector access

Not around a function that itself will grab the rng lock.

Unfortunate that we obtain/release the lock twice
but this seems least invasive way to fix this.