Merge changes I9fb59763,I8b2c6e00

* changes:
  SurfaceTexture: consume buffers after err checks
  SurfaceTexture: change onFrameAvailable behavior