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

Change-Id: Ic908915602bfdade8e3d5fadf0197f02839ea790