Merge "Android: Remove obsolete WPA_UNICODE_SSID define"