ANDROID: update to 1.8.7 version am: 234472c9f2 am: d5b45ca17d

Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650936

Change-Id: I13cad964647230026946d0d113dc12800a4855c4