Reconcile with jb-release

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