Merge "SnapdragonCamera: Fix can not choose the size of qcfa"