Merge "libjpegrecoverymap: refactor of public APIs"