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

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