Revert "Merge remote-tracking branch 'tance/terminal-support' into cm-11.0"

This reverts commit b31c141651623af3d823b92c53e4347d132da9b9, reversing
changes made to 8881f708fbdc1d0da2f58c1728db548a38b8d61e.

Conflicts:
	Android.mk