Reconcile with jb-mr1-release - do not merge

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