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

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