Merge "goldfish_setup: grant ifconfig priv_sock_ioctls"
am: 4a0f550cc7

Change-Id: Ie7cfadf3dd2b8e0687bcfcb8f14c5234854dc727