Revert "Switched to cm wpa_supplicant in hopes of solving wifi errors"

This reverts commit 1c0dad5b4b86570f602f7f5a64b32105f0adacd3.