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