Remove unsafe cast in Client::createWithSurfaceParent am: a03e1302db am: f5d934e7ba am: 5d3244b469

Change-Id: I2d516d22b7fef006f272cfa48d6fc7c2baf46cd4