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

Change-Id: If3d0f2b2fae6093bce54cae34e92cfb40e49acc5