Reconcile with jb-mr1-release - do not merge

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