Revert "display: Switch to the qcom/CAF variant"

This reverts commit 3034a3419a269f84a110674a33822a5ce37d6682.
This commit caused a build error in QCameraHWI_parm.cpp