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

Change-Id: I1a72f0aaf0b11bd5cc148debecc23693f7b12264