msm: camera2: fix merge derp

Change-Id: I662297c90499072a92ee06cdb73cb854887c9f28