Merge "Fix two small possible bugs." into jb-dev
tree: 09f02cdb6717f9b202386673ff48f53d8f68277d
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk