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