removed find5 deps and use cm ones

Change-Id: I0254d044c4fe8c50abcae2c379cb6a459992791e