Reconcile with jb-release

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