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

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