am f2a10900: am 5c36065b: Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both...
am f2a10900: am 5c36065b: Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build."
* commit 'f2a10900':
Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.