Merge "Enable the memory_recursiveprot mount option"