Merge "MediaCodec: move to UNINITIALIZED state on codec error"