Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build."