Merge "msm: Remove all references to CONFIG_ANDROID_PMEM"