am 216c29ec: Reconcile with jb-release

* commit '216c29ec51de9616264a1e9ee3dd5ac840701d03':
tree: b5d88158e7bced24376180233ca07838fe9e6a40
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk