Merge "jpegrecoverymap: add initial recovery map calculations."