Merge "Improve neverallows on /proc and /sys"