Merge "Define sockaddr_storage in bionic" am: d8b97f48c1 am: 3d4251bf70

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1748129

Change-Id: I5fad426d2ff52e476a1458b57a01a95907c65e55