Merge "Fix build breakage" into jb-dev
tree: 226aed6678da7fc0352bc24a9d40a5286be0d285
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk