Merge "Fix build"
tree: 5a0185a6eaa3213d1740ae3e7d46ddc45eb9c2fc
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk