Merge "Move RIDL socket to /data"