Merge "Label and allow access to /data/system/ndebugsocket."