Reconcile with jb-mr1-release - do not merge

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