Update classpath to remove obsolete apps and to fix compile error when importing to eclipse

Change-Id: I3c325b5027bfc7fc6542d2880bd60316781be372
Merge "Update classpath to remove obsolete apps and to fix compile error when importing to eclipse" into cm-11.0
Merge cm 'branch cm-11.0' into cm-11.0