Merge "target: msm8974: changes to avoid the compilation warnings"