Reconcile with jb-mr2-release - do not merge

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