merge from open-source master

diff --cc Android.mk
index 55e3106,3376f2c..5e8f07f
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -33,12 -33,12 +33,15 @@@ endi
  # To ignore possible wrong network configurations
  L_CFLAGS += -DWPA_IGNORE_CONFIG_ERRORS
  
 +# To allow non-ASCII characters in SSID
 +L_CFLAGS += -DWPA_UNICODE_SSID
 +
+ # OpenSSL is configured without engines on Android
+ L_CFLAGS += -DOPENSSL_NO_ENGINE
+ 
  INCLUDES = external/openssl/include frameworks/base/cmds/keystore
    
 -OBJS = config.c common.c md5.c md4.c rc4.c sha1.c des.c if_index.c
 +OBJS = config.c common.c md5.c md4.c rc4.c sha1.c des.c
  OBJS_p = wpa_passphrase.c sha1.c md5.c md4.c common.c des.c
  OBJS_c = wpa_cli.c wpa_ctrl.c