Merge commit '6ee1bd42' into gingerbread-plus-aosp * commit '6ee1bd42': Keep addWordToDictionary from doing disk I/O on main thread