Merge "target: msm8916: changes to avoid compilation warining"