Reconcile with jb-mr1-release - do not merge

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