core/os/android/adb: Fix tests.

`bind.Simple.String()` now returns the device name if it is non-empty.
The name field of the `device.Instance` is now also set.

Author: ben-clayton

core/os/android/adb/adb_test.go

@@ -41,6 +41,6 @@ func mustConnect(ctx context.Context, serial string) adb.Device {
 func TestADBShell(t_ *testing.T) {
 	ctx := log.Testing(t_)
 	d := mustConnect(ctx, "production_device")
-	assert.For(ctx, "Device").ThatString(d).Equals("production_device")
-	assert.For(ctx, "Device shell").ThatString(d.Shell("").Target).Equals("shell:production_device")
+	assert.For(ctx, "Device").ThatString(d).Equals("hammerhead")
+	assert.For(ctx, "Device shell").ThatString(d.Shell("").Target).Equals("shell:hammerhead")
 }

core/os/android/adb/device_test.go

@@ -30,7 +30,7 @@ func TestParseDevices(t_ *testing.T) {
 	defer func() { devices.Handlers[0] = validDevices }()
 	expected := &device.Instance{
 		Serial: "production_device",
-		Name:   "",
+		Name:   "hammerhead",
 		Configuration: &device.Configuration{
 			OS: &device.OS{
 				Kind:         device.Android,