Use supplicant overlay conf

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