camera_h:fix miss merge

Change-Id: I2c1783e58e9ee654f4001f7964879dee94a6f2d7