Merge "platform: msm8226: changes to avoid the compilation warnings"