Merge 2577fca1

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