Merge "msm: 9625: Correct the NR_MSM_GPIO count"