Reconcile with jb-mr2-release - do not merge

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