Merge "target: msm8916: fix the compilation error for 8916 target"