Reconcile with jb-mr2-release - do not merge

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