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

* commit '6ad0c4ffc3d50a6829a984c2ac37525680fc61eb':
  Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.