Merge "Reland "Also package recursive jni_libs deps of android_apps as well as direct deps." with bug fix."
