Merge "SnapdragonCamera: add EIS in dev option"