Merge "SnapdragonCamera: Fix FD roll_dir issue"