Reconcile with jb-mr1.1-release - do not merge

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