Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.

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