am b6b9f0a6: Reconcile with jb-release

* commit 'b6b9f0a6b1e7a4b1a55674bb75ea81af121b4279':
tree: 996c9ad94f3ba5c2716768cdfa1782fff47ce846
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk