Merge "surfaceflinger_client: Don't dereference NULL ptrs."