Merge change 1171

* changes:
  Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to.