Camera fix pt2 (3/3)

This reverts camera fix (2/2) bacause we are using cameraparameters.h on device repo