Merge "Allow the adb server to bind on ::1" am: 80a734f146
am: 4922f2aef2

Change-Id: I2a1b563770dd563a80fa83bed8d58f7ca4984ff3