am c57a22c8: merge from open-source master

Merge commit 'c57a22c8561cc571d23cd7f321103b2b4d2c7cde' into kraken

* commit 'c57a22c8561cc571d23cd7f321103b2b4d2c7cde':
  Let "adb connect" connect to emulators too