merge in jb-mr2-release history after reset to jb-mr2-dev
tree: 7c14d385688f05a4d099bc6a07d7ae1b6e2e3ac0
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk