Merge "Revert "Also package recursive jni_libs deps of android_apps as well as direct deps.""
am: 9fd9b92d51

Change-Id: Ice9ac150ea8f1a8c37c6401e3a3dfe4a9d135b49