am 8822a52c: am 287c739d: Merge "Fix build"

* commit '8822a52c3f35acf34c10946e91cbcc230e4f88f5':
  Fix build
tree: c6c24c5589a6e3dd246221abd6c294b45a0bb1d4
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk