am ae511451: am 9b195dda: Revert https://android-git.corp.google.com/g/#change,63791 as library loading issue seems to have been fixed now.

Merge commit 'ae511451000240ddde36d5568b393f0769286f62'

* commit 'ae511451000240ddde36d5568b393f0769286f62':
  Revert https://android-git.corp.google.com/g/#change,63791 as library loading issue seems to have been fixed now.
tree: 5e707eec515a4a2f4b90558f918381466fc81f55
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk