Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.

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