Stop tracking duplicate projects... cm & ours... this is why I added
a .gitignore to ours to stop tracking /default, which confused me, but
they are the same, so we need to drop cm under /default and only use
ours. Then we can remove the stupid .gitignore from ours too.

Change-Id: I7bda4c5ed0f74b53b5cce2e86d7faeb07a66cfb4
My Repo Changes

Change-Id: I382c5b0dd3ddc652c1df815f0871dc8ba083aadd