am 82c852cb: (-s ours) am b528e251: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '82c852cb4644e28b55fad08f04cae9e124b32cc2':
  Fix an NPE in recorrection
  Fix an NPE in recapitalize
tree: fa225299ab3812b8a27babc4bfe736b78045fc19
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk