Merge "SurfaceTexture: call ConsumerBase::freeBufferLocked" into jb-mr1-dev