Merge changes I4dd906fe,I2ef7f266 into rvc-dev

* changes:
  MediaCodec: set release surface in more states
  CCodec: fix resource releases