LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build.

Change-Id: If21a4f5ddab6ae9ecb37f6e7ebebef411028b2ef
Merge "LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build."
auto-merger: merge in from aosp/master