Start using generic_find to look for dependencies

Change-Id: Iaf96f149e126e62bbddbe6ec8a8cd30c93b93857