Merge "Revert "Also package recursive jni_libs deps of android_apps as well as...
Merge "Revert "Also package recursive jni_libs deps of android_apps as well as direct deps."" am: 9fd9b92d am: 91ef43f3 am: b9f21634
Change-Id: I8a7191c050535882bbcbb9bad0141b31ef3abfb6