Reconcile with jb-mr1-release - do not merge

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