Revert "Use the Finder's results for faster searching"

This reverts commit 4e3ea546d7f0d95def0a5788a143e9d82cfcf515.

Reason for revert: New Build Breakage: aosp-master/build_test @ 4283735

Change-Id: Icf62c628c1d0cb0b1fd4b401ae1a866f7f88c477
2 files changed