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

Change-Id: Ia3994ed5b3b16bee848d915041a9b24ebbba44b7