Merge "libjpegrecoverymap: solve recovery map 8-pixel alignment"