Use suplicant overlay conf

Change-Id: I8d4b297f2bcf8d942a6793d5fae46e4938a2225c
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2