Merge "Clean up libjpegrecoverymap dependencies"