Merge "SnapdragonCamera: Adjust video encoder bit rate and add 60fps support" into camera.lnx.1.0-dev.1.0