am 19e4741d: Merge "Use direct dependency on the JNI so files."

* commit '19e4741df60643d4fdb876e77069bb63857a12b2':
  Use direct dependency on the JNI so files.