Merge "goldfish_setup: grant ifconfig priv_sock_ioctls"