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