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

Change-Id: I11c94f09eeb36bf42d632c15b689e8c7b43e3c16