Merge "libjpegrecoverymap: fix dependencies"