Merge "msm: camera: Use correct direct field size while copying" into dev/msm-4.9-camx