Merge "MediaCodec: manage resources for sw video codecs"