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

Merge commit '9b195dda60bb2a072fcdc477206e223d60f8776c' into gingerbread-plus-aosp

* commit '9b195dda60bb2a072fcdc477206e223d60f8776c':
  Revert https://android-git.corp.google.com/g/#change,63791 as library loading issue seems to have been fixed now.