Remove CMUpdater and Revert: "Remove Term, su, and CMUpdater from user builds"

Change-Id: If6e08e81b2870ff97df03a8e433d777f3a38d3ec