Reconcile with jb-mr1-release - do not merge

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