am 610cf57b: am 2cccd9a2: Merge "We don\'t need WPA_SUPPLICANT_VERSION in generic build."

* commit '610cf57b2c27919accba8ee9ce99001dcceab886':
  We don't need WPA_SUPPLICANT_VERSION in generic build.