Merge changes Ief507b3f,I45256bb1

* changes:
  Add InetDiagMessage.inetDiagReqV2 with different args
  Fix StructInetDiagSockId parsing for v4-mapped v6 address
tree: 7c999b809232bede84bb07426a701ce8939e3f04
  1. staticlibs/