Merge "Replace GoogleDeviceSetup with DeviceSetup in FlickerTests"