Merge "sepolicy: allow system_server to read /proc/locks"