Revert "Track CMs dalvik"
I need to work on the a little before I re-add it.
This reverts commit 8d2dbf3e5a02d29126f06785c40912953641ce3d.