clean up and add correct revision to cm repos

Change-Id: I6c01d98cda4d9c97f0fbe6e9dcd1f63641861ff7