Log Message: emulators/cannonball: Removes the patch (missed in the last commit). - Removes patch that has been merged upstream.