Merge changes I47abfed5,I70124bbe,Id414080d,Ica311d44

* changes:
  Make xfrm_test pass with newer versions of iproute.
  Don't fail if CONFIG_INET_UDP_DIAG is not enabled.
  Fix tests to pass on newer versions of scapy.
  Make testIPv6PktinfoRouting pass on 32-bit Python.
tree: cb51b9201345e3b3885d98d8d10bbb08ec324275
  1. devicetree/
  2. net/
  3. Android.bp