Reconcile with jb-mr1-release - do not merge

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