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

Change-Id: Ia7c19f8885f55eae0399dc42882fc768e1c05b1f