inlude/media/msm_camera.h: fix another mismerge