Revert "Merge remote-tracking branch 'koush/master' into cm-11.0"

This reverts commit 747679eceec8a7ff8e662dbe0dfad503c60ef756, reversing
changes made to b31c141651623af3d823b92c53e4347d132da9b9.
Revert "Merge remote-tracking branch 'tance/terminal-support' into cm-11.0"

This reverts commit b31c141651623af3d823b92c53e4347d132da9b9, reversing
changes made to 8516028fcf8e6f18625af453411d67324f84af66.