Merge "Revert "Allow writable files in /sys/fs/selinux"" into jb-mr1.1-dev