Reconcile with jb-mr2-release - do not merge

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