AOSP: Some SD changes

AOSP: Some SD changes

These came hidden in the following AOSP commit. The changes are not from
upstream.

commit 04949598a23f501be6eec21697465fd46a28840a
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Thu Jul 19 12:16:46 2012 -0700

    wpa_supplicant: Update to 07-Jul-2012 TOT

    commit a5ed45586c63ffd8f9d2b44e27c251d7bacbeaf4
    Author: Jouni Malinen <j@w1.fi>
    Date:   Sat Jul 7 13:01:45 2012 +0300

        WPS SSDP: Fix socket leaks on error paths

    Change-Id: I0864aac7fc88fa2a60f5cca7d524b94363410c85
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>