Merge "JPEG/R refactory: rename jpegencoder and jpegdecoder"