Merge changes I6a13438a,I36f9d563

* changes:
  libjpegrecoverymap: add JPEG encoder for single channel image
  libjpegrecoverymap: add jpeg encoder with YUV input