Reconcile with jb-release

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