Merge "grouper: wlan: Add wpa_supplicant overlay file support" into jb-mr2-dev