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

* commit '08785f116b2f947e8d5a12ae4d1612d82f860d91':
  Use direct dependency on the JNI so files.