Reconcile with jb-mr1-release - do not merge

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