Revert "Revert "msm: camera: Fix based on stock camera - Failed...""

This reverts commit 84100c30ef65ed2b2760d53f4e50c58ca308345a.