Merge "Revert "msm: Make CONFIG_STRICT_MEMORY_RWX even stricter""