device: CM packages clean-up

Both can be installed from the Market.

Change-Id: I7155e616c592ee87ca1fcde454af95fd094c8bfa