Merge "Allow the adb server to bind on ::1"