am 17cc3969: Merge "Fix build"

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