Merge "Add image codec support to MediaCodec"