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

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