Merge changes If34bd5eb,Ib373b71b

* changes:
  CCodec: don't trigger output format change after flush
  MediaCodec: fix output format change event timing