am 243e04f8: Merge "Treat VER_2_1_DEVEL the same as VER_0_8_X"

* commit '243e04f81f9bef56ff5663bc25d280c7c33beb87':
  Treat VER_2_1_DEVEL the same as VER_0_8_X
  Android: Do not compile wpa_supplicant if not chosen
am dd9a784a: Merge commit \'f62167e88c0c1b9621f2984f1a59ae7d41cf4c88\' into HEAD

* commit 'dd9a784a6d34cdc14c68b03c2402e4fbd5cd7e20':
am d28183c0: Merge "Android: Use external libnl 2.0 dynamic library"

* commit 'd28183c0c33f5ee3876b49ce24cad01f701b6742':
  Android: Use external libnl 2.0 dynamic library
auto-merger: merge in from aosp/master