Reconcile with jb-mr1-release - do not merge

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