Fix for VPN not working

Currently VPN can connect, but it's not used by system(e.g the interface is not added to route).

Cherry-pick two commit from android kernel repo(https://android.googlesource.com/kernel/common.git/).

Personally tested the kernel works and fixed the VPN problem.