Reconcile with jb-mr2-release - do not merge

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