am 76533ab5: Reconcile with jb-mr0-release

* commit '76533ab5926089ffde286cd34090eddfc5b9d947':
tree: 4570e419fd740af5635abaee1296c0a8d11e9cc5
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk