update mint repos, temp remove some CM stuff

Change-Id: I93287c656b149c9433dc40669297b38fcda2e1da