Switch to using repos directly from CM

Change-Id: Ib03f4439cc2b93b7eee5df96ac9aad8810911f39