omap4-common: switch wpa_supplicant back to the normal version

this is needed to fix wifi instability and high power-usage
caused by a change to the wpa_supplicant_lib.

Change-Id: Ia4f12fd36f22e4266ef68141f6d18e1fe333a432
overlay: restore Verizon specific eri.xml locally

Change-Id: Ide1843cd64aa87a632d16ec5e0f2b81a4a80b5ea
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0