Merge "jpegrecoverymap: fix linkage for tests."