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