Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev