Merge "SnapdragonCamera: Change file naming convention" into camera.lnx.1.0-dev.1.0