Merge "msm: pm-8x60: Refactor to remove dependencies on rpm_resources.c" into msm-3.0