Merge "Fix JNI" into jb-mr1-dev
tree: c7d1dc030f9dc4c8eb393de59e0d0c0fa159c1b4
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk