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