Merge "Blocking SIGALRM while using connect syscall to connect emulator to adb" into studio-1.3-dev