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