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