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