Merge "msm: remove references to CONFIG_ANDROID_PMEM"