Reconcile with jb-mr1-release - do not merge

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