Merge "Fix sample spacing in lens shading map saved to DNG" into pi-dev
am: 40c43221f6

Change-Id: Ica595b0d636779991c5148011e6b8261aef68a5f