Reconcile with jb-mr1-release - do not merge

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