Merge "msm8916: Correct the base addresses for 8916"