Merge pull request #2594 from johnmccutchan/fixed_device_port_forward

Add DevicePortForwarder with adb fix