Reconcile with jb-release

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