shooter: Update defconfigs to fix VPN

10x sultanxda
Merge remote-tracking branch 'johnny/cm-11.0' into HEAD