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

This reverts commit a21887e8785851b0a71b55551430fe0ae6d76f8c.

Conflicts:
	config/common.mk

Change-Id: I504f8eeabb0907e04d463bcaaeffc16148465d0a
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2