am ed5ce6c1: Merge "Remove extension keyboard" into gingerbread

Merge commit 'ed5ce6c1a3d3a38a28cd2ed480a4d877160fa6ae' into gingerbread-plus-aosp

* commit 'ed5ce6c1a3d3a38a28cd2ed480a4d877160fa6ae':
  Remove extension keyboard