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