Merge "Acloud: acloud create failed to create ssh tunnel but still did adb connect." am: 1b8df518f0
am: 1cc1c6c3be

Change-Id: I535520777354eb576fbc1ec4ada7d3c4510e08c1