Reconcile with jb-mr1-release - do not merge

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