Merge "adb: skip IPv6 test if IPv6 isn't available."
am: 46e59af921

Change-Id: I90cfa05f2f81a7bbd3b160dce9b86557cbfd243f