Merge "Also package recursive jni_libs deps of android_apps as well as direct deps."
am: ff8cb1e69e

Change-Id: I22f9f842f7125a5ff86abedd70387456bd26210f