Merge "Remove Term, su, and CMUpdater from user builds" into cm-10.2