am 8223a7f0: am ee41b1df: Merge "Fix libcore translation of AF_UNSPEC InetAddress instances."

* commit '8223a7f0c4dd1119d05199f48fe70d854cd8b558':
  Fix libcore translation of AF_UNSPEC InetAddress instances.