am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1

* commit 'e5febfd5bd9b19a01383760b523476ba7f013a5c':
  Clean up the spell checker framework