Bug 1033402 - Update marionette client and marionette device host.

Ported from master.