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