Merge "libjpegrecoverymap: XMP updates."