Revert "Handle a special case of lock aliasing during lock verification"

Fails run-test with --tracing or --debuggable.

This reverts commit 82898ed01eedfb82a5b4adfe1327b827210af3ca.

Change-Id: I8005a1fbe63c6508d9abd5bea77679201c71ab46
5 files changed