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