Merge "skia: fix a regression in decoding DNG" into nyc-dev