resolved conflicts for merge of 4ad92578 to master

Change-Id: I29ad9f0ba357e39889e30c9ebfcf61f9d08ee4ef
tree: 60b5b60bebf41d9949011bd7e39a71a86d48eb79
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk