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

Change-Id: Ie148db453bd110771dc86d341ceab7706e695916