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

Change-Id: Ic9697c11ff23fdacda82549f90283f2c550d94da