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

Change-Id: I2b9dd978f506ee6022ba05bf46f754f7dce7d032