Standardize on hiding the lock implementation

It seems like the other drivers (if they use a proxy object
to do the locking) hide the lock in the external non-proxy
object so this changes mirrors that hiding of the proxy object
instead of exposing it.

Change-Id: I2bd8f8c9f66aed960d14784053b9b32999ac394e