Merge "Fallback to IPv6 when IPv4 is not available in adb" am: c32d7fd66f am: 5b7c6772b0 am: 27c6c4cf04
am: 4b9774fe97

Change-Id: I1a76d4245be930ae9e6cff32f54cf0158d216f2b