Clean up leftovers of CMUpdater and CMFota to fix FC on "about phone"

Change-Id: I3007f9638d67b675b55cf0007c4c5bee5e596a00