Merge "Add InetAddresses class to API"
am: 92871b78fa

Change-Id: If821b32c686fd603035050c09598384796f72fb2