Reconcile with jb-mr1-release

Change-Id: I7a9dbdc939b8eb2cdae21553c4783ddafce88af6
tree: 0a4f69acae66ca6f9916d154086862fd5be3dc8a
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk