Reconcile with jb-release

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