Reconcile with jb-mr1-release - do not merge

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