am 287c739d: Merge "Fix build"

* commit '287c739db9715222733af18b5e575f0bba1033bf':
  Fix build
tree: 8861e7ded07d3b94a99f773fa1d44a1424a383d2
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk