Merge 2caa1d81ce8b15902a055f802c6b6057b216063b - do not merge

Change-Id: I49fb6693ae1231235b91c48058bf9d3daa74e38f
tree: bd125e2e14aa291c031f8097725bcdc478e2a7d8
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk