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

Change-Id: I5e66a4c56247e7f588feece0d1d8f6dee2dda278