Merge "ARM: config: Add VPN support"