Merge "libjpegrecoverymap: add JPEG decoder for YUV and single channel"