Merge "Allow hostapd to open UDP sockets" am: af18f47571 am: 61c2a02524
am: 07c3f8c59b

Change-Id: Ied07b089aa9c82539900a6476844abb3cd20937c