Merge "libjpegrecoverymap: refactor"