Don't create a lock just for the resolver

A larger description of the issue is included in javadoc in the change.

Change-Id: Icc81555f16249ebae1aa54d76e2f3690cfe6966a
Fixes: 113139033
Fixes: 113159208
Fixes: 113165580
Test: Platform runs without deadlocks