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

* commit '2db4db04ec38c53f9189070782f2d1be7832761e':
  Treat VER_2_1_DEVEL the same as VER_0_8_X
  Android: Do not compile wpa_supplicant if not chosen