Merge "SurfaceTexture: allow set_buffer_count(2)"