use cm's repos for these instead

Change-Id: I5690ef4ae3b9206d84ec462bb6093d861769d3c0