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

Change-Id: I36a63f1da329e8022d8f627dedc5352bba5d44be