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

This reverts commit 753a055b5398fcf00d2633565452679c8fb93e9d.

Reason for revert: Fixed failing tests

Test: m test-art-host

Change-Id: I4a8be656288199108c05c9d302393e1efa41a7a4
7 files changed