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

* commit '9e502e90b58b4d0bbb792ef1c40dcfd9b9322ce8':
  Clean up the spell checker framework