Use CM equivalents repos we haven't modified and that were on AOSP

Change-Id: Idb608669a2bbf6e896c10ec211c8fea2afddaca4