ART: Move find-locks code up in the callchain am: b90cad5807
am: 88201e9a78

Change-Id: I7eae2b5c8e1f5f62b57a1100d07f0163f6a173c0