Reconcile with jb-release

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