Merge "msm: rpm: Correct MSM8930+PM8038 resource mapping"