Reconcile with jb-mr2-release - do not merge

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