Merge "Fix build" into jb-dev-plus-aosp
tree: 66d4ef184a3b20cb793cb2f4889317d4467c2987
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk