Reconcile with jb-mr2-release - do not merge

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