Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

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