Merge "libjpegrecoverymap: a few fixes"