Reconcile with jb-release

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