am 6996a1fc: am 6ad0c4ff: Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build."

* commit '6996a1fc34e0e5531f2368612805665cde628f27':
  Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.