Reconcile with jb-mr1-release - do not merge

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