Merge changes If51126b8,I05322cf0

* changes:
  wpa_supplicant: Change wpa_supplicant.conf template name
  Move .config for Android to android.config