manifest: track these from CM instead

Not much activity in these repos so lets just track directly from CM

Change-Id: I673639c5ded096afd696c69a7783ebde24d6fbf9